bitkeeper revision 1.1159.212.51 (41fa5cccoJa4CtdiYB99zon6qwiusw)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 28 Jan 2005 15:39:56 +0000 (15:39 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 28 Jan 2005 15:39:56 +0000 (15:39 +0000)
commitc2c6eda50e29fee0081567814d0809805b2250fc
tree820be75319842a1e18673c2036dbbdbbf29a9b71
parente1dbd11b76a86fd64d69fc763c579c9a8b1e61f7
parentdbb2d95b1d17436180618de305c8d9ac9bf9433e
bitkeeper revision 1.1159.212.51 (41fa5cccoJa4CtdiYB99zon6qwiusw)

Merge firebug.cl.cam.ac.uk:/auto/anfs/scratch/scramble/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/auto/anfs/scratch/scramble/kaf24/xen-unstable.bk
xen/arch/x86/x86_32/xen.lds
xen/arch/x86/x86_64/xen.lds